merge trunk
authorKenichi Handa <handa@etlken>
Wed, 26 May 2010 00:36:51 +0000 (09:36 +0900)
committerKenichi Handa <handa@etlken>
Wed, 26 May 2010 00:36:51 +0000 (09:36 +0900)

Trivial merge